merge with xen-unstable.hg

diff --cc xen/arch/ia64/xen/machine_kexec.c
index 849a395f2396b85b4d3eee9e94fdd4614212b99f,d1addea8c1021aeadfa16ebc3ab8e8be1e1c123b..221f59cf16c0dc21a769b1d090b8137a0fa6af19
--- 1/xen/arch/ia64/xen/machine_kexec.c
--- 2/xen/arch/ia64/xen/machine_kexec.c
+++ b/xen/arch/ia64/xen/machine_kexec.c
@@@ -24,7 -24,19 +24,8 @@@
  #include <linux/cpu.h>
  #include <linux/notifier.h>
  #include <asm/dom_fw_dom0.h>
+ #include <asm-generic/sections.h>
  
 -typedef asmlinkage NORET_TYPE void (*relocate_new_kernel_t)(
 -                                      unsigned long indirection_page,
 -                                      unsigned long start_address,
 -                                      struct ia64_boot_param *boot_param,
 -                                      unsigned long pal_addr,
 -                                      unsigned long cpu_data_pa,
 -                                      unsigned long kernel_start,
 -                                      unsigned long page_offset,
 -                                      unsigned long vhpt)
 -                                      ATTRIB_NORET;
 -
  #define kexec_flush_icache_page(page)                                 \
  do {                                                                  \
        unsigned long page_addr = (unsigned long)page_address(page);    \